3b0f81e44f48cea00b6bff94712a20cfffb82346,src/edu/stanford/nlp/trees/EnglishGrammaticalStructure.java,EnglishGrammaticalStructure,collapseMultiWordPrep,#Collection#Collection#String#String#String#String#,1507

Before Change



    // only if we found the three parts, set to KILL and remove
    // and add the new one
    if (prep != null && dep != null && pobj != null && newtd != null) {
      if (DEBUG) {
        System.err.println("Removing " + prep + ", " + dep + ", and " + pobj);
        System.err.println("  and adding " + newtd);
      }
      prep.setReln(KILL);
      dep.setReln(KILL);
      pobj.setReln(KILL);
      newTypedDeps.add(newtd);

After Change


      }
    }

    if (pobj == null || newtd == null) {
      return;
    }

    // only if we found the three parts, set to KILL and remove
    // and add the new one
    // Necessarily from the above: prep != null, dep != null, pobj != null, newtd != null

    if (DEBUG) {
      System.err.println("Removing " + prep + ", " + dep + ", and " + pobj);
      System.err.println("  and adding " + newtd);
    }
    prep.setReln(KILL);
    dep.setReln(KILL);
    pobj.setReln(KILL);
    newTypedDeps.add(newtd);